Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 05:57:58 +0000 (05:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 13 May 2010 05:57:58 +0000 (05:57 +0000)

Trivial merge